a11y: Get rid of gtk.h includes in headers

This way, we can include them without accidentally including deprecated
code. Which means we can still use the recently added turning-off tricks
for deprecation warnings.

diff --git a/gtk/a11y/gtkcontaineraccessible.h b/gtk/a11y/gtkcontaineraccessible.h
index 639ff5d5a79b6a79c011d7ec3e08ef1e6f43f2b4..1f2193343925f4ed2190e390ef3ab327d6ce5f30 100644 (file)
--- a/gtk/a11y/gtkcontaineraccessible.h
+++ b/gtk/a11y/gtkcontaineraccessible.h
@@ -20,6 +20,7 @@
 #ifndef __GTK_CONTAINER_ACCESSIBLE_H__
 #define __GTK_CONTAINER_ACCESSIBLE_H__
 
+#include "gtkcontainer.h"
 #include "gtkwidgetaccessible.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/a11y/gtkmenuaccessible.c b/gtk/a11y/gtkmenuaccessible.c
index df30d987cab1a1d38c5f4b18dd32cdc25281fed2..542ce98c0c185c436395ce2dc5aae6d5b0071192 100644 (file)
--- a/gtk/a11y/gtkmenuaccessible.c
+++ b/gtk/a11y/gtkmenuaccessible.c
@@ -21,6 +21,7 @@
 
 #include "gtkmenuaccessible.h"
 
+#include <gtk/gtk.h>
 
 G_DEFINE_TYPE (GtkMenuAccessible, _gtk_menu_accessible, GTK_TYPE_MENU_SHELL_ACCESSIBLE)
 

diff --git a/gtk/a11y/gtkmenuaccessible.h b/gtk/a11y/gtkmenuaccessible.h
index 59f29469e8d0c694ca83f0968c198f82a5dca1dc..cb3da491fc614248de4d5cf77db191071183ce3b 100644 (file)
--- a/gtk/a11y/gtkmenuaccessible.h
+++ b/gtk/a11y/gtkmenuaccessible.h
@@ -20,6 +20,7 @@
 #ifndef __GTK_MENU_ACCESSIBLE_H__
 #define __GTK_MENU_ACCESSIBLE_H__
 
+#include "gtkmenu.h"
 #include "gtkmenushellaccessible.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/a11y/gtkscalebuttonaccessible.h b/gtk/a11y/gtkscalebuttonaccessible.h
index affa380554a61f9db55a89469e4ba6ca5187cf16..1e3e4abc87001e173c50d56596f42ae44a4edab8 100644 (file)
--- a/gtk/a11y/gtkscalebuttonaccessible.h
+++ b/gtk/a11y/gtkscalebuttonaccessible.h
@@ -20,7 +20,6 @@
 #ifndef __GTK_SCALE_BUTTON_ACCESSIBLE_H__
 #define __GTK_SCALE_BUTTON_ACCESSIBLE_H__
 
-#include <gtk/gtk.h>
 #include "gtkbuttonaccessible.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/a11y/gtktreeviewaccessible.h b/gtk/a11y/gtktreeviewaccessible.h
index 5de261905d1c85873f4076528992f38d3f14c14a..38b739d880854157984a2bff2984ade76e86f036 100644 (file)
--- a/gtk/a11y/gtktreeviewaccessible.h
+++ b/gtk/a11y/gtktreeviewaccessible.h
@@ -20,7 +20,6 @@
 #ifndef __GTK_TREE_VIEW_ACCESSIBLE_H__
 #define __GTK_TREE_VIEW_ACCESSIBLE_H__
 
-#include <gtk/gtk.h>
 #include "gtkcontaineraccessible.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/a11y/gtkwidgetaccessible.h b/gtk/a11y/gtkwidgetaccessible.h
index 3f9d4cab3ef0c037d9099d9fb3a8c1df588bf455..cd9009cf8501b3fe9bb0b47c31d8679c0d250056 100644 (file)
--- a/gtk/a11y/gtkwidgetaccessible.h
+++ b/gtk/a11y/gtkwidgetaccessible.h
@@ -20,7 +20,8 @@
 #ifndef __GTK_WIDGET_ACCESSIBLE_H__
 #define __GTK_WIDGET_ACCESSIBLE_H__
 
-#include <gtk/gtk.h>
+#include "gtk/gtkaccessible.h"
+#include "gtk/gtkwidget.h"
 
 G_BEGIN_DECLS